global: Remove support for the NONREACTIVE input mode

As it's unused, this is a quick cleanup before we can go onto
more important things.

https://bugzilla.gnome.org/show_bug.cgi?id=700735

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index dbb1fe0380bd95093c53c7dd7db1a551edd82c68..edfd6d3cd7d2db4eb1bf6ed9e12c4fc2f6f713ed 100644 (file)
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -61,8 +61,7 @@ const CtrlAltTabManager = new Lang.Class({
         if (item.focusCallback) {
             item.focusCallback(timestamp);
         } else {
-            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
-                global.stage_input_mode == Shell.StageInputMode.NORMAL)
+            if (global.stage_input_mode == Shell.StageInputMode.NORMAL)
                 global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
 
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);

diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 9f1374ed7c66f03a59bbd752ef288194b3adb732..b4294b32c752f6b63cd30a0ec0f405de15cc3e0b 100644 (file)
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -211,10 +211,8 @@ const GrabHelper = new Lang.Class({
             this._grabbedFromKeynav = hadFocus;
             this._preGrabInputMode = global.stage_input_mode;
 
-            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
-                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
+            if (this._preGrabInputMode == Shell.StageInputMode.NORMAL)
                 global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-            }
 
             this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
             this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));

diff --git a/src/shell-global.c b/src/shell-global.c
index 889e1461208e3b11eef1fa2b63f1e0a252adb242..fe354823f401c2cac0fa6396b68bb461bad38f11 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -546,13 +546,10 @@ shell_global_focus_stage (ShellGlobal *global)
  * @mode: the stage input mode
  *
  * Sets the input mode of the stage; when @mode is
- * %SHELL_STAGE_INPUT_MODE_NONREACTIVE, then the stage does not absorb
- * any clicks, but just passes them through to underlying windows.
- * When it is %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts
- * clicks in the region defined by
- * shell_global_set_stage_input_region() but passes through clicks
- * outside that region. When it is %SHELL_STAGE_INPUT_MODE_FULLSCREEN,
- * the stage absorbs all input.
+ * %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts clicks in
+ * the region defined by shell_global_set_stage_input_region() but
+ * passes through clicks outside that region. When it is
+ * %SHELL_STAGE_INPUT_MODE_FULLSCREEN, the stage absorbs all input.
  *
  * When the input mode is %SHELL_STAGE_INPUT_MODE_FOCUSED, the pointer
  * is handled as with %SHELL_STAGE_INPUT_MODE_NORMAL, but additionally
@@ -561,9 +558,8 @@ shell_global_focus_stage (ShellGlobal *global)
  * will revert to %SHELL_STAGE_INPUT_MODE_NORMAL.
  *
  * Note that whenever a mutter-internal Gtk widget has a pointer grab,
- * the shell behaves as though it was in
- * %SHELL_STAGE_INPUT_MODE_NONREACTIVE, to ensure that the widget gets
- * any clicks it is expecting.
+ * the shell goes unresponsive and passes things to the underlying GTK+
+ * widget to ensure that the widget gets any clicks it is expecting.
  */
 void
 shell_global_set_stage_input_mode (ShellGlobal         *global,
@@ -575,7 +571,7 @@ shell_global_set_stage_input_mode (ShellGlobal         *global,
 
   screen = meta_plugin_get_screen (global->plugin);
 
-  if (mode == SHELL_STAGE_INPUT_MODE_NONREACTIVE || global->gtk_grab_active)
+  if (global->gtk_grab_active)
     meta_empty_stage_input_region (screen);
   else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region)
     meta_set_stage_input_region (screen, None);

diff --git a/src/shell-global.h b/src/shell-global.h
index a8df0f5bc82f46444b40cc015e8659a1bab25990..69dff85544398aeec84668c4189ff6756a6ebe4d 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -46,7 +46,6 @@ void     shell_global_end_modal              (ShellGlobal         *global,
                                               guint32              timestamp);
 
 typedef enum {
-  SHELL_STAGE_INPUT_MODE_NONREACTIVE,
   SHELL_STAGE_INPUT_MODE_NORMAL,
   SHELL_STAGE_INPUT_MODE_FOCUSED,
   SHELL_STAGE_INPUT_MODE_FULLSCREEN